From: Mattias Engdegård <mattiase@acm.org>
Date: Sat, 20 Jul 2019 17:16:38 +0000 (+0200)
Subject: Make tramp test regexp more robust
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~2208
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d0eeb62c43cc3041b322249b488ad157c506abaa;p=emacs.git

Make tramp test regexp more robust

* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
Match a greater variety of human-readable size values.
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 64ba0414e88..1404ef39d55 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2827,7 +2827,7 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	       (looking-at-p
 		(concat
 		 ;; There might be a summary line.
-		 "\\(total.+[[:digit:]]+[KMGTPEZY]?\n\\)?"
+		 "\\(total.+[[:digit:]]+ ?[kKMGTPEZY]?i?B?\n\\)?"
 		 ;; We don't know in which order ".", ".." and "foo" appear.
 		 (format
 		  "\\(.+ %s\\( ->.+\\)?\n\\)\\{%d\\}"